From 437ce0197b5a6be71a738bfd477af1d045cb88d5 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Sat, 16 Sep 2017 15:46:50 +0100 Subject: [PATCH] Adwaita: dark: Make colorswatch.light tick visible MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It used $text_color unconditionally, but in :dark, text is white, so we overlaid a white tick on any light colours, all the way to white itself. Using these named colours doesn’t make practical or semantic sense. Instead, use white/black over dark/light swatches, as in HC, so all variant–swatch combos work. Light looks the same, & :dark works now. For backdrop, use alpha 0.5, unlike 0.7 in HC, as that seemed excessive & different from the current effect. 0.5 is almost identical to how $backdrop_fg_colour is a 50% mix of $fg_color, & matches backdrop text. https://bugzilla.gnome.org/show_bug.cgi?id=787531 --- gtk/theme/Adwaita/_common.scss | 8 ++++---- gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++---- gtk/theme/Adwaita/gtk-contained.css | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 6ae8f5290e..f0041c80f9 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -4117,19 +4117,19 @@ colorswatch { } &.dark overlay { - color: $selected_fg_color; + color: white; &:hover { border-color: if($variant == 'light', transparentize(black, 0.2), $borders_color); } - &:backdrop { color: $backdrop_selected_fg_color; } + &:backdrop { color: transparentize(white, 0.5); } } &.light overlay { - color: $text_color; + color: black; &:hover { border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color); } - &:backdrop { color: $backdrop_text_color; } + &:backdrop { color: transparentize(black, 0.5); } } &:drop(active) { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index a219335a9d..be1d69a91c 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1764,17 +1764,17 @@ colorswatch.right, colorswatch:last-child:not(.bottom) { border-top-right-radius colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay { border-top-right-radius: 5px; border-bottom-right-radius: 5px; } -colorswatch.dark overlay { color: #ffffff; } +colorswatch.dark overlay { color: white; } colorswatch.dark overlay:hover { border-color: #1b1f20; } -colorswatch.dark overlay:backdrop { color: #d3d4d5; } +colorswatch.dark overlay:backdrop { color: rgba(255, 255, 255, 0.5); } -colorswatch.light overlay { color: white; } +colorswatch.light overlay { color: black; } colorswatch.light overlay:hover { border-color: #1b1f20; } -colorswatch.light overlay:backdrop { color: #d3d4d5; } +colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); } colorswatch:drop(active) { box-shadow: none; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index cb0bb10d69..2ad07d0b7b 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1784,17 +1784,17 @@ colorswatch.right, colorswatch:last-child:not(.bottom) { border-top-right-radius colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay { border-top-right-radius: 5px; border-bottom-right-radius: 5px; } -colorswatch.dark overlay { color: #ffffff; } +colorswatch.dark overlay { color: white; } colorswatch.dark overlay:hover { border-color: rgba(0, 0, 0, 0.8); } -colorswatch.dark overlay:backdrop { color: #fcfcfc; } +colorswatch.dark overlay:backdrop { color: rgba(255, 255, 255, 0.5); } colorswatch.light overlay { color: black; } colorswatch.light overlay:hover { border-color: rgba(0, 0, 0, 0.5); } -colorswatch.light overlay:backdrop { color: #323232; } +colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); } colorswatch:drop(active) { box-shadow: none; } -- 2.30.2